From c396430dff409a35f41978ad01dc0b8570234c91 Mon Sep 17 00:00:00 2001 From: "Karl O. Pinc" Date: Sun, 28 Jun 2020 15:39:49 -0500 Subject: [PATCH] Better test of validate_settings() --- src/pgwui_server/__init__.py | 3 ++- tests/test___init__.py | 9 +++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/pgwui_server/__init__.py b/src/pgwui_server/__init__.py index e6baaa7..6708439 100644 --- a/src/pgwui_server/__init__.py +++ b/src/pgwui_server/__init__.py @@ -192,7 +192,8 @@ def validate_literal_column_headings(errors, settings): def validate_settings(errors, settings, components): '''Be sure all settings validate ''' - component_keys = ['pgwui.{}'.format(component) for component in components] + component_keys = ['pgwui.{}'.format(component) + for component in components] for key in settings.keys(): abort_on_bad_setting(errors, component_keys, key) validate_setting_values(errors, settings) diff --git a/tests/test___init__.py b/tests/test___init__.py index 90d8153..8eb3741 100644 --- a/tests/test___init__.py +++ b/tests/test___init__.py @@ -312,17 +312,22 @@ mock_validate_literal_column_headings = testing.make_mock_fixture( def test_validate_settings(mock_abort_on_bad_setting, mock_validate_setting_values, mock_validate_hmac): - '''Calls abort_on_bad_setting() for each key in setting + '''Calls abort_on_bad_setting() for each key in setting, + with the proper list of config declaration names for the + plugin components ''' settings = {'key1': 'value1', 'key2': 'value2'} + components = ['pgwui_server'] errors = [] - pgwui_server_init.validate_settings(errors, settings, []) + pgwui_server_init.validate_settings(errors, settings, components) assert mock_validate_setting_values.called assert mock_validate_hmac.called assert mock_abort_on_bad_setting.call_count == len(settings) + assert mock_abort_on_bad_setting.call_args[0][1] == \ + ['pgwui.{}'.format(components[0])] mock_validate_settings = testing.make_mock_fixture( -- 2.34.1